From: p4u <p4u@dabax.net>
Date: Wed, 24 Apr 2013 14:56:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/bmx6-owrt/master' into openwrt-bmx6
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=1320cfb7bda91c47de50d924546bc147c0484a7b;p=feed%2Frouting.git

Merge remote-tracking branch 'remotes/bmx6-owrt/master' into openwrt-bmx6
---

1320cfb7bda91c47de50d924546bc147c0484a7b